Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 25 Aug 2011 19:06:56 +0000 (12:06 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 25 Aug 2011 19:06:56 +0000 (12:06 -0700)
commit1ec9e27909036f27c3f52d9a48d5f657c7b037de
tree41f66025a084edd3c5c2d4222db5b1808c6bca36
parent4492a061eae45ee3a52fccf6bb02cc2acff8bcb6
parentbab739ec97f34ab3ab36e3f7f2f50be7302752ea
Merge from trunk.
src/ChangeLog
src/bidi.c
src/buffer.c
src/dispextern.h
src/xdisp.c